Bug 534979 – GtkImageMenuItem is a bin but has two children.

2008-08-04  Björn Lindqvist  <bjourne@gmail.com>

	Bug 534979 – GtkImageMenuItem is a bin but has two children.

	* gtk/gtkimagemenuitem.c (gtk_image_menu_item_forall): Do not
	include the image widget when iterating over non-internal
	children. Patch by rainwoodman.

svn path=/trunk/; revision=20985

diff --git a/ChangeLog b/ChangeLog
index d58a1d4f19bd838acfecaad1fe6b144f4acea369..4ee00add1acb47e8d4225790817ef60d6e85d744 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-04  Björn Lindqvist  <bjourne@gmail.com>
+
+       Bug 534979 – GtkImageMenuItem is a bin but has two children.
+
+       * gtk/gtkimagemenuitem.c (gtk_image_menu_item_forall): Do not
+       include the image widget when iterating over non-internal
+       children. Patch by rainwoodman.
+
 2008-08-04  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 369375a0a454b7c9fd5ba8b9b612dc9e58e6f953..6c8e4ed547baef73383b1388a86d88199de2e67b 100644 (file)
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -352,7 +352,7 @@ gtk_image_menu_item_forall (GtkContainer   *container,
                                                                      callback,
                                                                      callback_data);
 
-  if (image_menu_item->image)
+  if (include_internals && image_menu_item->image)
     (* callback) (image_menu_item->image, callback_data);
 }